[IA64] remove linux-2.6-xen-sparse/arch/ia64/xen/xenconsole.c

Inline the content of early_console_setup() to setup.c and remove
xenconsole.c

Signed-off-by: Aron Griffis <aron@hp.com>

diff --git a/linux-2.6-xen-sparse/arch/ia64/kernel/setup.c b/linux-2.6-xen-sparse/arch/ia64/kernel/setup.c
index 77325e2d1ef89b299ac240d505d5f73edaaefca1..b0f737e16fc9031b548fbf11ed0eaa1691479975 100644 (file)
--- a/linux-2.6-xen-sparse/arch/ia64/kernel/setup.c
+++ b/linux-2.6-xen-sparse/arch/ia64/kernel/setup.c
@@ -347,8 +347,14 @@ early_console_setup (char *cmdline)
        int earlycons = 0;
 
 #ifdef CONFIG_XEN
-       if (!early_xen_console_setup(cmdline))
+#ifndef CONFIG_IA64_HP_SIM
+       if (is_running_on_xen()) {
+               extern struct console hpsim_cons;
+               hpsim_cons.flags |= CON_BOOT;
+               register_console(&hpsim_cons);
                earlycons++;
+       }
+#endif
 #endif
 #ifdef CONFIG_SERIAL_SGI_L1_CONSOLE
        {

diff --git a/linux-2.6-xen-sparse/arch/ia64/xen/Makefile b/linux-2.6-xen-sparse/arch/ia64/xen/Makefile
index da3ca07cd00807eb0d090e2b64a27febb0772a55..7a3d1a1f63f5167927fc83d0f1c67d4c16a9ea9f 100644 (file)
--- a/linux-2.6-xen-sparse/arch/ia64/xen/Makefile
+++ b/linux-2.6-xen-sparse/arch/ia64/xen/Makefile
@@ -2,7 +2,7 @@
 # Makefile for Xen components
 #
 
-obj-y := hypercall.o xenivt.o xenentry.o xensetup.o xenpal.o xenhpski.o xenconsole.o
+obj-y := hypercall.o xenivt.o xenentry.o xensetup.o xenpal.o xenhpski.o
 
 obj-$(CONFIG_XEN_IA64_DOM0_VP) += hypervisor.o pci-dma-xen.o util.o
 pci-dma-xen-$(CONFIG_XEN_IA64_DOM0_VP) := ../../i386/kernel/pci-dma-xen.o

diff --git a/linux-2.6-xen-sparse/arch/ia64/xen/xenconsole.c b/linux-2.6-xen-sparse/arch/ia64/xen/xenconsole.c
deleted file mode 100644 (file)
index 4c6d9ea..0000000
--- a/linux-2.6-xen-sparse/arch/ia64/xen/xenconsole.c
+++ /dev/null
@@ -1,19 +0,0 @@
-#include <linux/config.h>
-#include <linux/console.h>
-#include <asm/hypervisor.h>
-
-int
-early_xen_console_setup (char *cmdline)
-{
-#ifdef CONFIG_XEN
-#ifndef CONFIG_IA64_HP_SIM
-       if (is_running_on_xen()) {
-               extern struct console hpsim_cons;
-               hpsim_cons.flags |= CON_BOOT;
-               register_console(&hpsim_cons);
-               return 0;
-       }
-#endif
-#endif
-       return -1;
-}